(x_delete_display): Fix merge error.

diff --git a/src/ChangeLog b/src/ChangeLog
index 6181aeb59dcc7353e3aa7e33a002257da28831d5..802a4a3ff90c04204777ed405bb2b2efd595994c 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,7 @@
 2008-09-02  Andreas Schwab  <schwab@suse.de>
 
+       * xterm.c (x_delete_display): Fix merge error.
+
        * fileio.c (Fexpand_file_name): Remove unused variables.
 
 2008-09-02  Eli Zaretskii  <eliz@gnu.org>

diff --git a/src/xterm.c b/src/xterm.c
index 603ec993af2b410fff6f85199532f328add4627b..88fb04d665e1f337634a0b88cde51416b6ed697a 100644 (file)
--- a/src/xterm.c
+++ b/src/xterm.c
@@ -10516,7 +10516,6 @@ x_delete_display (dpyinfo)
   /* Xt and GTK do this themselves.  */
 #if ! defined (USE_X_TOOLKIT) && ! defined (USE_GTK)
 #ifndef AIX            /* On AIX, XCloseDisplay calls this.  */
-  /* Xt and GTK does this themselves. */
   XrmDestroyDatabase (dpyinfo->xrdb);
 #endif
 #endif